Interception for NonCollection Fix.