Fix #5675