previous commit also fixes #976