Final update fix that I delayed so I wouldn't get a merge conflict with aufdemrand. :p