Bug 807122 - add fix for frame scope clobbering