Helper bug fix