Fix issue on 2.6