Fixes issue #36