(Fix: Bug 2711)