(fix) Avoid static keyword