First pass at resolving issue #721