Try resolving some race conditions