[fix #5] Date and Teacher fix