[Core/Collections] Minor flexibility fix