[3026] Improve previous commit