Fix watch option