Fixes issue #98 (Collection always using primary)