Fixes issue 148