Issue #19: Fixed.