Fixed issue where suffix was setting prefix.