Fix for a subtle string corruption