Replaced a static variable by a member