fixed some retarded bug