Fix static variable into normal class variable
Fix static variable into normal class variable again