fix issue on 2.3.1 and 3.0