Fixed bug in Issue #19