fixed (3.3 fixes)