WL-3501 Fix control loop