mobile fix attempt#2