All calls should now closure properly