Ok, I'll add the check, and I'll update the classes that do not confirm.