Fix #462 for 2.3.4