Fix #176 for 2.4(.5)