Fixes issue 323