fix #1163 #1165

Closed belforte closed 9 years ago