Fixing a bug in listener!