Fix #5952