Fix #4 passing event to callback