Fixes issue 102