Prevent race condition with .watch()