macro handling fix :)