Fixed bug2