Hotfix: self parameter added