Fix #12810

Fix #12810