fixing variable setups