Fix #176 for 2.3