Lost a forever fix in the previous merge. Fixing.