Disabled cleanOrientAttributes, it needs to be revised