Fix #398 for 2.3.2 as well