Fixed environment issue