Fixed helper issue