Fix related to issue #1