Should definitively fix quiz issues.