Another try at 2.6