Investigation into issue #331.