Add an unbelievably dirty hack for callbacks. Needs a permanent fix (raised issue #12)