fixed some consistency problem