Fix #28 for 2.3.3