Fix for #2198 mobile changes