best solution ever :D
more fixes on grader.js