Fixed bug with variables name in macro