fix #1068 #1089 #1078

Closed belforte closed 10 years ago