Fixed helper class - AH