API Has been fixed, so new code reflects usage.