change M16 macro to use M8 macro inside