fix for issue #8 and #9