add #2031 fix to changelog