Fixed Issue #3