From fix1
Merge branch 'fix1'