resolves Issue #22
fixes issue #22