Fixes issue 42