Fix for OnExplore