Going to School bugfix