Better fixed issue #2