I think this fixes the flaw. close #432