Fix #411 for 2.3.3 as well