Some fix to the previous commit