FIXME_STUB improved