fixes transistion to personal mac and env keys