Small bug of expanding was fixed