fixed controllers and decorators