+ Fix some issue