Reverting last fix