Fix generic helper