new-subs bug fixing