fixed wrong changes caused by mess