Fixup after Arni's proofreading