Fixed github issue #7