AutoPointer fix