Firewall on SetGetContract fixed