Merge pull request #1618 from sdroege/callbacks-no-box-reference

Merge pull request #1618 from sdroege/callbacks-no-box-reference #1076