Fix bug with incorrect Controller reference