improve buggy class runtime