FIX: Bug passing through border-portal fixed