Final mobile fix