fix to match new interfaces