Fixup that slluis asked for.