Another try at #19.