Fix bug? (no repeatability): #405