Fixed Issue #2