Fix #4840