Fixed bug'