Fixed an issue #9.