Update from mav@ - don't break the input switching.