Slight bug fix with drag and drop pairing