Undo and fix border issue