Fixed bug in helpers.