Fix Issue #19.