Fix for Suffix longer than name