bugs fixed
bugs fixed at native macro