Fixed Issue #18