Fixes duplication of subs count