Fixed for spec change