FIX: Fix pairing order