Repair watch service

by Slava Khripushin