Change keeping order to keeping sanity