Collection Interception Fix