Fix contracts not collapsing