Fix for existing API.