Ajusting for server issues