Improvement for previous commit