Pull request for fix-367

Sorry, here the pull request fix for the bug 367.