fix when
Merge branch 'weo' of github.com:weo-edu/meteor into weo