addendum to 'fix #3561 + fix #3575'