fix of small refactor for helper