fixes issue #15