previous commit also fixes #976 #985

Closed belforte closed 10 years ago