Fixes Issue #14; hopefully fixes issue #15