Fix #32 for 2.4.0