Fix implemented for Issue #19