Fix callback
Merge branch 'release-0.8.1' into dev