fix nil refs caused by a renamed function