fixed issue with callback