Fixes #496
Merge pull request #497 from adaptlearning/issues/496

Fixes #496