LYR-143 quick fix for a bug introduced while fixing MOB-1367
LYR-143 addressed code review notes
Merge pull request #3381 from Wikia/LYR-143

LYR-143 quick fix for a bug introduced while fixing MOB-1367