Fixes #504
Merge pull request #526 from adaptlearning/issue/504

Fixes #504