This is P3, so does not have to be fixed and release immediately, so why not to take care of the FIXME right away?