Undoing my first fix