Fixed callback function
Fixed callback