Added back environment workaround