Fixed Issue #7