improve & fix the previous commit