Changes from fix2 branch
Merge branch 'bug1234'