Fix spec broken in merge