found a fix for issue #1833 that keeps the tests passing