Fixes for ISSUE #1