fix helper calls