Merge: Contract: bug fix