Another try at issue #1