HOTFIX: fix wrong using class methods