Changes related to issue #2