Fix issue with callback