fix callback issue