Bugfix handling suffixes in negociation process.