ApplicationControllerAndFactory manually changed 

carefully of course