Loose the conditions that atomic calls are captured. Need to come up with better...