Issue #25: Fixed.