Fixes issue 103