Fix issue on 3.4.X review