Fix lost variables