Fix to the previous commit