Fixed helper methods