Fixed for new server version support