[Core] Fix Customs