fix for #950 #951

Closed belforte closed 10 years ago