Minor extends fix