Fix #656 for 2.3