Fixed github issue #2