Fixes issue 356