Fixed small concatenation bug when other calculation characters are present.
Made concatenations robust.