Fixed witness set bug