[BUGFIX] Remove improper use of static property