fixes issue #271 and #275