Fixed bug in helpers