fix for issues #1 and #2