fixes issue #30