Fixed small bug with my bug fix ;-)