try to fix a bug inducing concurrent modification, pushing to the server to test