Closing issue #2