Less buggy