Fix #422 for 2.3.3