Fixed issue with callbacks