Moved hack event from gateway to handler