Fixed weird where in controllers