Fixed Issue #19.