Change to use static agian
Complate fixing static error