fixed issue: #1083