Add a FIXME for non-critical issue