Fix a bug exposed by uses in CFE