5618795 fix #2 enhancements