put controller back where it belongs