fixed a bug
Merge branch 'rc' of https://github.com/TEAMMATES/repo into rc