fix special cases for macro 8 (2nd part)