Fix watch feature