Fixed watch close wait script