fixes for [issue #9]
fixes for [issue #9]