Fixed Issue #12