fix special cases for macro 6