fix rivets for nested calls