fix for #1137 #1138

Closed belforte closed 10 years ago