fix note 0015914 (part of #5589)