Another small bug fix