Fix to allow for global calls