fixed

Signed-off-by: Raf <7909000@gmail.com>
fixed helper functions to avoid conflicts

Signed-off-by: Raf <7909000@gmail.com>