Fixed bug in replace-vars with single-char vars