Better #1990 fix.