fixed new issue #6