Fixed data contract issue