Add fix for looped subs