Can you take out this FIXME if it's fixed now?