FIX #715 - Simulate controls changes in every case.