callback issue fixed