fixed watch/datagraph