fix one FIXME, sync with macro 2