Solved some problems caused for the reversion