a much smaller fix to prevent the second layout from clobbering the first one - this is what I should have done for #10