Fix #4541