Fix for composite types
Fix for OnBanCheck