Fix bug in helpers