Fix controller methods