Quick fix for environment