Resolve bug #1457429.