correct command handling for xde-watch