Fix issue #1 - partial callbacks were not working correctly in this version.