Fixes issue 220