fixed strings corrupted in merging in pull request 499