fix wrong method calls
wip