Fix #459 for 2.3.4