Capabilities race fix for 1.3 branch