Contract Fix