Fix bug #951 for 1.3.0