Fix an issue #9