Fix for teacher relocation