Fixed Watch ID bug