Fix watch by namespace