fix for #1079 #1080

Closed belforte closed 10 years ago