bugid:96399 - reapplied the fix from 8b1609ba
Merge pull request #401 from Wikia/release-147-bugid-96399

bugid:96399 - reapplied the fix from 8b1609ba