Prevent strings from getting larger than 16 chars

Fixes #2314