Fixed ring of the teacher for pushing... I think
Merge