Fixed timeout issue related to status watchers