Helpers, bug correction
Merge branch 'develop'