Fixing order of newValue/oldValue for watch