Collections in user context fix