Avoid Kadira error on direct update