second attempt to fix issue; tests are WIP