Revised
Fixed a bug