Additional rewriting for consitency