triple-distilled fix against latest head