One last fix to #71
Merge branch 'release-0.8.24g' into development
Release 0.8.24h