issue 3505 fix: add a test, for great justice