Fix #38 for 2.3.4 as well