Fix issues introduced by combining string variables #1188