fixed env cludge