K/Q pair provision fix #7