another piece toward fixing Issue #1