Fixed small bug with previous commit (2)