Fixes issue 138