Merge in bug fix