fix another FIXME, sync with with macro 2