Issue #1 Fix

Fixes issue #1