Fixed helper
Merging fixes