xinput_calibrator stretches across two screens

[globeone]

Setup:
Touchscreen (IIyama T1931SR-B1 or Elo)
Non-Touch (Dell or HP 19" Desktop Monitor)
Nvidia Videocard - Nouveau Drivers - Extended Desktop (Xinerama)

When running xinput_calibrator the calibration window with the targets gets stretched across both screens. This is silly as there is no situation ever where this would be useful. Please fix xinput_calibrator to only show the targets for and calibration for one screen at a time. Especially only on the touchscreen itself.

If you need any logs or config files or to test let me know I have 10 of these configurations.

Thanks a million