Fix Issue #4

This fixes issue #4