Fix vars
Fix key var