YH-621: fix logic error organization helper