Fix #5426
Fix #5426