quick fix from old version