IMOB-254 - fixed what needed to be done