issue #5160: Don't use static variables, use member variables