Fixes issue 98