Fixing acceleration bugs