Try to fix #462 for 2.4
Implement #447