Fixed to match interface