Fix #4467