Fixed initial macro loading