First pass at resolving issue #1126