Fix: Bug 701