Fixed dangerous macro