Remove a `FIXME' comment and fix the associated problem.