fix handler tag