fixes #1034 #1035

Closed belforte closed 10 years ago