partially fixes issue #19