Fix some issue for 8