Improved 'env' fix
flicked version