Fix #101 for 2.3.3