Issue #240,fixed coding