Added fix for the early callback issue