I see 2 other places where this change would need to be done.