Fixed issue #12327

Follow up to #12328