Fix yet another double-pointer bug