maybe fixed the issue with the callbacks. Needs testing.