Fixed bug1