fixed issue with callback structure