Fixed an issue #8