@pevicent Could you confirm that it works for you (your test case is passing now)? @sbiereig Could you check if new changes do not break anything in ADPLL?