Fix. See comments below.