Bugfix/optional callback

This pull request is sponsored by Monday Morning Coffee