Fixed helper class