working on issue 366 (getting close in some tests)