Merge pull request #1622 from rbrito/fix-extension