Fixed pinging issue