Fixed small bug from last commit