Fixed hack handler and gateway trace