Fixes issue 22