allow to extend built-in controllers + fix bug