non-cubbie fix2