fix helpers
Merge branch 'develop'