fixing callback