Fix issue in watch
simulate now works