Undo bugfix