Fixed Client & Server Bug with Timeout