Update for minor bug fix upstream