Fix #173 for 2.3.5