fix scoped calls