Do not repeat old strings

Fixes #678, fixes #494