Fixed a bug of the previous commit