Fixed Issue #19