fix sub's on foo getting foo.bar when foo.bar is set