Addresses bug 943006 review