fix for #1064 and #1065 #1066

Closed belforte closed 10 years ago