fix #1185 #1188

Closed belforte closed 9 years ago