Fixed RemoteQuery, which broke with the Epoll update
Merge pull request #1080 from RuriRyan/master

Fixed RemoteQuery, which broke with the Epoll update