Try to fix further timeout messages