Fixes #449
Merge pull request #451 from adaptlearning/issues/449

Fixes #449