previous commit also fixes #976
Merge pull request #985 from belforte/master

previous commit also fixes #976