MYLOC-107 - Fixing bug