Hack until we resolve some bugs at the moodle side (only for the moodle branch)