replay of 7bfc856: fixed overwrite between 2D res and nonres