Fix for PR14264 cause by commit r167237 which did not take into account a