Slight modification to the previous commit