Issue #19: fix