Fetched upstream, changed final variable to private