Fix #5785