Removed potential errors with string concatenation.