bugfix on check handlers arity