Found another spot where there could be timing issues, and fixed it.