Final part of the autoskip fix.