Yet another small bug fix