- Fixed little bug with escaping variables and buffer tag