Fixed duplicate leaving messsage