Temporary fix for PageAdapter
Another temporary fix for PageAdapter