Fix another part of Issue #986