All of the refactor bugs should be gone