Changed Controller dispatch behaviour. Removed unnecessary code.