Fixes issue 295