So maybe some FIXME comment not to forget about that?