Removed weird listener