Bug fix static controller
Bug fix mobile