final fix for HOME and USER env variable