Fixed Issue #4.