v1.3.6. Improvement