fixed issue with callback not firing