NearMe bug fix