try to make PBS adapter more robust