fixing helpers