fix bug @ merge changes from school_dev_beta