Hopefully final API fix