Fix Issue #23, #19