Fixes 502
Merge pull request #503 from adaptlearning/issues/502

Fixes 502