Fix up for the issue 12077