Fix some issue on 2.6