Fix embeded subs