is this FIXME still important?