Fixes #5946 - Only call fact_name_class.maximum if necessary.
(cherry picked from commit 9e78711ab374d349186b5ba58f2fb8fb58e14ff4)
Fixes #5946 - Only call fact_name_class.maximum if necessary.
(cherry picked from commit 9e78711ab374d349186b5ba58f2fb8fb58e14ff4)