some fixes with subs