Fix the before load and controller deferred mode