Fix #420 for 2.3