fixed
will add notification_controller