0.9.8 version of PR#1931 fix.