Using short timeout to fix potential race conditions