Temporary fix for numeric sorting issue #8276