Fixed Success callback bug