very minor cosmetic fix
import changes from macro 7