Fix issue with callbacks clonning