Close issue #2