Fixed to use Current API.