Fix evolution state so it works when you run it more often than once