Fix a bug where a callback function hasn't been called
Merge branch 'develop'