code likely fixed (at least for faces)