Fixes issue 32