Fixed a bug in last comit