fix circular problem