Minor improvement in assignment to subscriptions