Fix some flaw