Fixed subs issues