Fix environment dependent of fadfa683a297f9a6017ec3700d273f5bc38c8e64