Another try at #97