Additional improvement to the previous commit