Fix some quality flaw