fixed issue with callbacks