Fix grue handler in listener
Fix grue handler in listener