Fixes issue 88