Fixed bug in helpers
Merge branch 'origin/development'