Fixing timing on Version A