Change the TODO to a FIXME