Merge "Bug fix."