DAR-1767 | Implement a fix
Merge pull request #1502 from Wikia/DAR-1767

DAR-1767 | Implement a fix