Fixed Issue #6