fixed issues with helpers