Main teacher bug fixed