Refactoring
Fixed mistake of guard watch