fix for issue #1 and #2