Fixup: Callbacks merge

This fixes the previous merge #39.