JC: fixed all spec.