fix for issue #1 fix