Added an assert and a FIXME