Rev 114704 addresses bug 1 described earlier. Leaving this open to
address bug 2.