Fix Callback bug