Fixed Issue #3.