Really fixed issue #7