Bug fix.
Merge branch 'fix'
Bug fix.