Pointer removal fix