REV:refactor to let issue rest to use handler