Better handling of blinded heads