Fixed to match Ben's library changes