bug fix for bug 123.
Merge branch 'BUG123'
Some more work