adjust static method vars as well