ec1d215 v1.2.0. Improvement.