Prevent potential threading issue