Fix incorrect static variables