Fix for MOTECH-613

Change-Id: Ic3e6c89d8c5fcfb9863ebcc4d26e27b25acdb70d