Fixed github issue #1