fix bug 2432 for 2.4 branch