bug fix: ephemeral watch creation