Merge bug fix