fix for issue #3 and #4