It seems this fixes timeout issues