fixed retarded bug