This is pedantic, but could we avoid this change?