Fixed github issue #5