Fix some issue for 5-6