funcBY: adaptation
funcBY: fix after rebase