Fixed small bug with previous commit (3)