Implement fix from adapt-contrib-spoor/issue/#11
Merge branch 'issue/#176' of github.com:adaptlearning/adapt_framework into issue/#176