Fixes issue 592