- fix stub handling bugs