Fix Issue #1 (Repair incorrect bugfix).