Fixed Issue #16