Localized the hanging test to the 'watch' clause.