Fix partial calls

bad cherry-picking