fixes issue #533