fix #1216 and #1215 #1220

Closed belforte closed 9 years ago