Really fix the suffix issue