some fix !