Fix PR issue #1