Remove race condition w/ get & set machines seen