#2 Removed explicit call to inlcudePopup