Fixed broken Controller