fix #652 events/watch merging