Fix #3989

More instances of the bug that was fixed with 43afc71b777b00cfc2638add6fa3c47d333c5e04
2 files changed