Improve call performance again.