Fix bug #171. Align with 1.3.16 branch.