Fix current server check - #216