Fixed: vars were not replaced if followed with certain chars.