FIX: Another bug passing through border-portal fixed