issue: #1161 fixed