Undoing bugfix