Fixes bugs with variable mapping