fixed after API change