Memory fix take 2, No colm surprises please