Merge bug fix.