Fixed small bug - AGAIN