Fix to better group variables.