Fix controller instantiation