yet more macro fixing