fix : handling