Less buggy, understand the problem