v1.3.9. Improvement