Controllers fixed