fixed for new api version