Fixes issue 20