Fixed a small bug that had to do with a listener