NOJIRA restore default controller support removed in merge