Fix bug handeling all server like java 7 server