Fix subs selection