Fix per issue #2