Fix PR12312