fixed wrong watch callback arguments