Updated for API fix