bug fixing & changed log