fix plusplus for multi-words