Fix #4453
Merge pull request #4454 from simonster/n4453

Fix #4453