Fixed urgent bug