Fixes issue 40