Fixed Issue #10.