[WFLY-2336] reorganized fix