Fixed small bug resulting in merge from master