Fix pointers

Not merge it! Cancel!