LPS-34138 Fix unmodifiable list error