Fix last_controller