Fixes issue 101