BugFix for Suffix