Additional change for #568.