Fix #5593