Fix #4955