Fix bug with controller load