Fixing #265
Merge pull request #278 from mozilla/fix-265

Fixing #265