fixes issue #236