[FIX] Make flip work when pair doesn't exist too (RT-2928)
Merge pull request #1981 from mrajvanshy/fix/flip2

[FIX] Make flip work when pair doesn't exist too (RT-2928)