fix classmate issues