PI Bug Fixes (Now using the correct superclass method), and avoiding loops in case of missing annotation.