Change var scope from class to global