Fixed a small bug in helpers