WFLY-3623 fix + testcase