also fixes issue #6