Quick fix for Issue #1817

A quick fix till the proper fix is applied
Merge branch 'master' of https://github.com/TEAMMATES/repo into Issue1871