Fix PR issue #2