Extend fix to other used variables.