Fixed helper initialization
Merge