#128 Mobile Fix