fixing more bug