master: Avoid global variable